Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 8 May 2010 10:54:36 +0000 (10:54 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 8 May 2010 10:54:36 +0000 (10:54 +0000)
commit7d73ad5bdb461da0ce3e7186103cb8dd0a2e1eb6
tree2bd8fee64fc329071c7c519c2a70b53fbc0a798c
parente79154a9c778037bcde8abd73a6c671a16e828f0
parent5fcf7e460450edf6f9573e0dcf1684973ca68385
Merge from mainline.